Cleaning up comments, manifests and sample for the AndroidListener git-svn-id: http://google-cache-invalidation-api.googlecode.com/svn/trunk@273 1cc9d426-c294-39be-ba72-c0199ca0f247
diff --git a/src/example-app-build/AndroidManifest.xml b/src/example-app-build/AndroidManifest.xml index 814a89b..b53cd3f 100644 --- a/src/example-app-build/AndroidManifest.xml +++ b/src/example-app-build/AndroidManifest.xml
@@ -1,88 +1,83 @@ -<?xml version="1.0" encoding="utf-8"?> - <!-- Copyright 2011 Google Inc. All Rights Reserved. --> - <!-- Test application for Android Client API and implementation. --> - <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.google.ipc.invalidation.examples.android2" android:versionName="2.3.0"> - - <!-- Permissions for GCM. --> - <permission android:name="com.google.ipc.invalidation.examples.android2.permission.C2D_MESSAGE" android:protectionLevel="signature" /> - <!-- App receives GCM messages. --> - <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" /> - <!-- GCM connects to Google Services. --> - <uses-permission android:name="android.permission.INTERNET" /> - <!-- GCM requires a Google account. --> - <uses-permission android:name="android.permission.GET_ACCOUNTS" /> - <uses-permission android:name="android.permission.USE_CREDENTIALS" /> - <!-- Keeps the processor from sleeping when a message is received. --> - <uses-permission android:name="android.permission.WAKE_LOCK" /> - <!-- GCM requires C2DM permissions --> - <uses-permission android:name="com.google.ipc.invalidation.examples.android2.permission.C2D_MESSAGE"/> - - <application> - <!-- Configure the listener class for the application --> - <meta-data android:name="ipc.invalidation.ticl.listener_service_class" - android:value="com.google.ipc.invalidation.examples.android2.ExampleListener"/> - - <!-- Example activity --> - <activity android:name=".MainActivity"> - <intent-filter> - <action android:name="android.intent.action.MAIN"/> - <category android:name="android.intent.category.LAUNCHER"/> - </intent-filter> - </activity> - - <!-- Receiver for scheduler alarms. Must be exported for the AlarmManager to call it. --> - <receiver android:exported="true" - android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"/> - - <!-- Ticl listener. --> - <service android:exported="false" android:name=".ExampleListener"> - <intent-filter> - <action android:name="com.google.ipc.invalidation.AUTH_TOKEN_REQUEST"/> - </intent-filter> - </service> - - <!-- **************************** BEGIN BOILERPLATE --> - <!-- Ticl manager service. --> - <service android:exported="false" - android:name="com.google.ipc.invalidation.ticl.android2.TiclService"/> - - <!-- Ticl sender. --> - <service android:exported="false" - android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"/> - - <!-- Receiver for scheduler alarms. Must be exported for the AlarmManager to call it. --> - <receiver android:exported="true" - android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"/> - - <!-- GCM Broadcast Receiver --> - <receiver android:exported="true" - android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener$GCMReceiver" - android:permission="com.google.android.c2dm.permission.SEND"> - <intent-filter> - <action android:name="com.google.android.c2dm.intent.RECEIVE" /> - <action android:name="com.google.android.c2dm.intent.REGISTRATION" /> - <category android:name="com.google.ipc.invalidation.ticl.android2" /> - </intent-filter> - </receiver> - - <!-- Normally, Chrome/Android would instantiate the multiplexer service for us. --> - <!-- GCM multiplexer --> - <service android:exported="true" - android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener"> - <meta-data android:name="sender_ids" android:value="ipc.invalidation@gmail.com"/> - </service> - - <!-- multiplexed GCM receiver --> - <service android:exported="false" - android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageReceiverService" - android:enabled="true"/> - <receiver android:exported="false" - android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageReceiverService$Receiver"> - <intent-filter> - <action android:name="com.google.ipc.invalidation.gcmmplex.EVENT" /> - </intent-filter> - </receiver> - <!-- **************************** END BOILERPLATE --> - </application> - </manifest> +<?xml version="1.0" ?> +<!-- Copyright 2011 Google Inc. All Rights Reserved. --> +<!-- Manifest for AndroidListener sample application. Must be merged with + j/c/g/ipc/invalidation/external/client/contrib:android_listener_manifest. --> +<manifest android:versionName="2.3.0" package="com.google.ipc.invalidation.examples.android2" xmlns:android="http://schemas.android.com/apk/res/android"> + <!-- *** WARNING *** DO NOT EDIT! THIS IS GENERATED MANIFEST BY MERGE_MANIFEST TOOL. + Merger manifest: + java/com/google/ipc/invalidation/examples/android2/AndroidManifest.xml + Mergee manifests: + blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml + --> + <!-- Declare and use permission allowing this application to receive GCM messages. --> + <permission android:name="com.google.ipc.invalidation.examples.android2.permission.C2D_MESSAGE" android:protectionLevel="signature"/> + <uses-permission android:name="com.google.ipc.invalidation.examples.android2.permission.C2D_MESSAGE"/> + <application> + <!-- Configure the listener class for the application --> + <meta-data android:name="ipc.invalidation.ticl.listener_service_class" android:value="com.google.ipc.invalidation.examples.android2.ExampleListener"/> + <!-- Example activity --> + <activity android:name="com.google.ipc.invalidation.examples.android2.MainActivity"> + <intent-filter> + <action android:name="android.intent.action.MAIN"/> + <category android:name="android.intent.category.LAUNCHER"/> + </intent-filter> + </activity> + <!-- Ticl listener. --> + <service android:exported="false" android:name="com.google.ipc.invalidation.examples.android2.ExampleListener"> + <intent-filter> + <action android:name="com.google.ipc.invalidation.AUTH_TOKEN_REQUEST"/> + </intent-filter> + </service> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- Receiver for scheduler alarms. --> + <receiver android:exported="false" android:name="com.google.ipc.invalidation.external.client.contrib.AndroidListener$AlarmReceiver"/> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- Receiver for scheduler alarms. --> + <receiver android:exported="false" android:name="com.google.ipc.invalidation.ticl.android2.AndroidInternalScheduler$AlarmReceiver"/> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- GCM Broadcast Receiver --> + <receiver android:exported="true" android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener$GCMReceiver" android:permission="com.google.android.c2dm.permission.SEND"> + <intent-filter> + <action android:name="com.google.android.c2dm.intent.RECEIVE"/> + <action android:name="com.google.android.c2dm.intent.REGISTRATION"/> + <category android:name="com.google.ipc.invalidation.ticl.android2"/> + </intent-filter> + </receiver> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- Merged from file: java/com/google/ipc/invalidation/external/client/android2/AndroidManifest.xml --> + <receiver android:exported="false" android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageReceiverService$Receiver"> + <intent-filter> + <action android:name="com.google.ipc.invalidation.gcmmplex.EVENT"/> + </intent-filter> + </receiver> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- Ticl service. --> + <service android:exported="false" android:name="com.google.ipc.invalidation.ticl.android2.TiclService"/> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- Ticl sender. --> + <service android:exported="false" android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageSenderService"/> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- GCM multiplexer --> + <service android:exported="false" android:name="com.google.ipc.invalidation.external.client.contrib.MultiplexingGcmListener"> + <meta-data android:name="sender_ids" android:value="ipc.invalidation@gmail.com"/> + </service> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- Invalidation service multiplexed GCM receiver --> + <service android:enabled="true" android:exported="false" android:name="com.google.ipc.invalidation.ticl.android2.channel.AndroidMessageReceiverService"/> + </application> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- App receives GCM messages. --> + <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- GCM connects to Google Services. --> + <uses-permission android:name="android.permission.INTERNET"/> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- GCM requires a Google account. --> + <uses-permission android:name="android.permission.GET_ACCOUNTS"/> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- Merged from file: java/com/google/ipc/invalidation/external/client/android2/AndroidManifest.xml --> + <uses-permission android:name="android.permission.USE_CREDENTIALS"/> + <!-- Merged from file: blaze-out/gcc-4.7.x-grtev3-k8-fastbuild/bin/java/com/google/ipc/invalidation/external/client/contrib/android_listener_manifest/AndroidManifest.xml --> + <!-- Keeps the processor from sleeping when a message is received. --> + <uses-permission android:name="android.permission.WAKE_LOCK"/> +</manifest>
